Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 2 Mar 2012 02:26:27 +0000 (18:26 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 2 Mar 2012 02:26:27 +0000 (18:26 -0800)
commit87e4b2f813c840fa8901844d9a22b4634ceb74ec
tree5b4114f2e834bc55c7fc4187e81f3356604dd97d
parent605c867189d9a2b8218e498acd8212da7d40ef33
parentb8b94c3f9078a55e9dccbca54855bc6289d1f8e4
Merge from trunk.